Merge commit '9cbdf20316' into native-comp

diff --cc .gitignore
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/emacs-lisp/byte-run.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/progmodes/cc-langs.el
Simple merge

diff --cc lisp/progmodes/elisp-mode.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/eval.c
index 10e53cf9aedc539939c229913145e7245be09ea0,ddaa8edd81706c4725136be35bdc9228b4a72b03..cf5ca3b4bbdfff7d4c8dc03e3303e07523c3a4d4
--- 1/src/eval.c
--- 2/src/eval.c
+++ b/src/eval.c
@@@ -219,17 -219,8 +219,17 @@@ voi
  init_eval_once (void)
  {
    /* Don't forget to update docs (lispref node "Local Variables").  */
 -  max_specpdl_size = 1800; /* See bug#46818.  */
 -  max_lisp_eval_depth = 800;
 +  if (!NATIVE_COMP_FLAG)
 +    {
-       max_specpdl_size = 1600; /* 1500 is not enough for cl-generic.el.  */
++      max_specpdl_size = 1800; /* See bug#46818.  */
 +      max_lisp_eval_depth = 800;
 +    }
 +  else
 +    {
 +      /* Original values increased for comp.el.  */
 +      max_specpdl_size = 2500;
 +      max_lisp_eval_depth = 1600;
 +    }
    Vrun_hooks = Qnil;
    pdumper_do_now_and_after_load (init_eval_once_for_pdumper);
  }